Nearly finished everything. One bug with the Mailsystem left.