Wow, I keep making tons of changes at once without committing. What an awful habit. Anyways, initial contact system is now almost complete. :)

Signed-off-by: Pamelloes <pamelloes@gmail.com>