ANOTHER SUPER MEGA COMMIT: application done :) some testings scenarios are not covered but it doesn't matter