Stable commit. Class cleaning. Reverting to basic activity base since fragments felt too much of over engineering a simple user flow.