OMG KISS WORKS. DONT TOUCH ANYTHING.
cleanup
updating for lint, coverage and style.
fixing indent
Merge branch 'feature/gba-kiss' into develop